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

* commit '8e8bca105f4668301d46bcb07dfb1ba2875b90e3':

Change-Id: Iaf59194f58bf14057423802b1687ac79a18ef95c