Merge "Merge changes from topic \'api_review\' into nyc-dev am: a0676c9 am: d72d582" into nyc-mr1-dev-plus-aosp
am: 74275f9

* commit '74275f938597a170cb04d1be5ba20f52842c8dde':

Change-Id: I3d6aa83d4a07bf66f78f0fadd91fd355f098e3d7