merge in nyc-release history after reset to nyc-dev rel-24-uda-r1-partner rel-24-uda-r1.2-partner
The Android Automerger [Thu, 23 Jun 2016 07:02:22 +0000 (00:02 -0700)]

Trivial merge