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

Change-Id: Ibfe3060a13c131315c19552376d4d989205cd8b1