merge in nyc-release history after reset to nyc-dev
The Android Automerger [Wed, 18 May 2016 07:04:02 +0000 (00:04 -0700)]

Trivial merge