merge in nyc-release history after reset to master
The Android Automerger [Mon, 1 Feb 2016 13:13:06 +0000 (05:13 -0800)]

Trivial merge