This PS removes the remaining deltas between OSH and OSH-Infra Change-Id: Ibe0c561991d23c1b0a4a24a6a1529d5ae255a779