merge in nyc-release history after reset to nyc-dev
The Android Automerger [Thu, 9 Jun 2016 07:04:44 +0000 (00:04 -0700)]

Trivial merge