merge in nyc-mr1-release history after reset to nyc-mr1-dev
authorPyry Haulos <phaulos@google.com>
Fri, 16 Dec 2016 22:19:07 +0000 (22:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Dec 2016 22:19:07 +0000 (22:19 +0000)
am: 868a8938ca

Change-Id: I07a0249da8ae52fb82ad6120dec0897f63d5e567


Trivial merge