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

Change-Id: I9621cf33b43c0795c9b2c343ff3bdac81cd0cfbf


Trivial merge