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

0b13609925908e38d62c05abd79528b2548ee551

Change-Id: I88039e798e26e2f3f33d5e3b85865b2958a963a1
1 file changed