merge in nyc-release history after reset to master
The Android Automerger [Thu, 4 Feb 2016 08:02:01 +0000 (00:02 -0800)]

Trivial merge