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

Change-Id: I82c416fb663418dd6bd062fa1b5375ec7c99fa5a


Trivial merge