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

Trivial merge