Merge "[Mainline] Core Platform APIs migration"