Merge "Add more APIs to CorePlatformApi for internal"
am: f4e65e6653

Change-Id: Iff40b8dc855f36e23a9b23d337a8a9c99523289c