merge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 2 May 2016 23:54:38 +0000 (16:54 -0700)]

Trivial merge