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

Trivial merge