merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev
authorTina Zhou <tinazh@google.com>
Fri, 16 Dec 2016 22:19:20 +0000 (22:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Dec 2016 22:19:20 +0000 (22:19 +0000)
am: 9412810768

Change-Id: I822bfa3fba4335717f34be9cfb4ff4c621c7ed8c


Trivial merge