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