0aace1705f
This PS removes the remaining deltas between OSH and OSH-Infra Change-Id: Ia322b7b62a5b755674d1a244748266e36edcfb8c