Merge "Merge "Address API review comments." into nyc-dev am: 9a32929def am: a87343fbeb" into nyc-mr1-dev-plus-aosp
am: 7ba17feb32

* commit '7ba17feb324c84c3e07780538f598b1b08677ad7':

Change-Id: I781832edec00b409d0dd236797953246fe875e88