merge in nyc-release history after reset to nyc-dev
The Android Automerger [Tue, 3 May 2016 07:03:39 +0000 (00:03 -0700)]

Trivial merge