merge in nyc-release history after reset to master
The Android Automerger [Tue, 2 Feb 2016 15:28:20 +0000 (07:28 -0800)]

Trivial merge