Merge changes from topic 'am-47c303cab10f49afaaaf3929a6369684' into nyc-mr1-dev-plus...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 17:46:29 +0000 (17:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:46:29 +0000 (17:46 +0000)
am: 5f034cee8b

Change-Id: I01dd2d39585be5003eda6ac2e211269864a7de85


Trivial merge