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

Change-Id: Ie47f54d6697a608ddfdac405b80f39954a9ebc7b