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