Merge "[CS15]Do not use hidden API of PlatformProperties"