Refactor Core Plaform API checking am: 01ecfa1c31 am: 9cbbd0263a
am: 37bd88e883

Change-Id: I76bb70df64618f8ca90831dc309b42a85c1118f8