merge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 23 May 2016 07:04:28 +0000 (00:04 -0700)]

Trivial merge