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

Trivial merge