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

Trivial merge