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

Change-Id: Id23dbea96fcdde835b825a49af5fe10a87715350


Trivial merge