Merge "Reduce core platform and intra-core APIs"
am: f8f01f05ca

Change-Id: I40344496ee55aac4c838283212a53be1a1b2b67a