merge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 6 Jun 2016 07:03:37 +0000 (00:03 -0700)]

Trivial merge