resolve merge conflicts of b172f9e to master am: ed8e08ff82 am: 657bfbfb71 am: 29baf2...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:26:41 +0000 (18:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:26:41 +0000 (18:26 +0000)
am: 843e8d6309

Change-Id: I295ed4a196593e358bffc99579fb5d302e3fefbb


Trivial merge