Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev