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:44:54 +0000 (22:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Dec 2016 22:44:54 +0000 (22:44 +0000)
am: f7c84f0b66

Change-Id: I544ccd22b9b46f2a922f5afb8bc51c5ed399a8da


Trivial merge