Merge "merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 868a8938ca...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 16 Dec 2016 22:45:00 +0000 (22:45 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 16 Dec 2016 22:45:00 +0000 (22:45 +0000)

Trivial merge