Merge "API review feedback changes" am: 84ea11384d
am: 6c1815ac79

Change-Id: Ibc28787179d9053773f4557b9058713fb57b1586