This PS reduces the delta between OSH and OSH-Infra helm toolkits. Change-Id: I5026b0238555513f8415a864adf4e91e81e3fbd8