merge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 11 Apr 2016 21:47:34 +0000 (14:47 -0700)]

Trivial merge