Merge "Re-add removed APIs per API council feedback." am: a94a71af13
am: 7085118cfc

Change-Id: Idecba0bbaed7b05dc02ec86788268bc8b945963a