Compile against core public SDK APIs only am: f78c7816cd am: d4c2ffb2d9
am: 1ca4444fe1

Change-Id: Ib0e8c38a8931ea93aa36aeefa2876cfacad1f3be