Merge changes from topic 'am-77ae52a26b474123bdafaa0a5618ec7b' into nyc-mr1-dev-plus...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 18:03:40 +0000 (18:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:03:40 +0000 (18:03 +0000)
am: d00efe50a8

Change-Id: Ie36ee583fb4ce3182390b234689c3bec8173e6c8


Trivial merge