Merge \"Merge \\"API 25 is frozen, so we can\\'t change API.\\" into...
Merge \"Merge \\"API 25 is frozen, so we can\\'t change API.\\" into nyc-mr1-dev am: 663cfc0f\" into nyc-mr1-dev-plus-aosp
am: a57cbde2
Change-Id: Ide9ce12a3c45722cbdd412e8c41cbf7256453d21