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

Change-Id: Iff62553b3037feb207fba5e356ec46d32d78fbb7


Trivial merge