Merge changes from topic 'am-afbe65226c664d438460b33cb5a405a8' into nyc-mr1-dev am...
authorKalle Raita <kraita@google.com>
Tue, 22 Aug 2017 20:29:49 +0000 (20:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:29:49 +0000 (20:29 +0000)
am: 9c4a1afa50

Change-Id: Ica1b4657f130b048827c595f6e892cb1d0fa2e86


Trivial merge