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

Change-Id: I578a721b99c32abad1ba471455355145ec38ea4b


Trivial merge