Merge changes from topic 'am-47c303cab10f49afaaaf3929a6369684' into nyc-mr1-dev-plus...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 17:57:11 +0000 (17:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:57:11 +0000 (17:57 +0000)
am: e20de5492e

Change-Id: Ie743ab03ca7f6199d9e36eb958b875b1ed81fc1f


Trivial merge