Merge changes from topic 'am-d93effc2c36944e2a5199ec02939cb56' into nyc-mr1-dev-plus...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 18:06:19 +0000 (18:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:06:19 +0000 (18:06 +0000)
am: 7f19157869

Change-Id: Ib08823c2a6ac1e914b31a718ddac632b908aba3e


Trivial merge