merge in nyc-release history after reset to master
The Android Automerger [Sun, 24 Jan 2016 08:02:12 +0000 (00:02 -0800)]

Trivial merge