Revert^2 "API changes as requested by API council."

0ef234f12bb9b0d123b08110c0db539f35893840

Change-Id: I3a3a9950ec9b236383d26d1b62bb3908c2aeb44a
5 files changed