resolve merge conflicts of 433645782 to oc-dev-plus-aosp
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 21:09:48 +0000 (21:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 21:09:48 +0000 (21:09 +0000)
am: 3a33181ba4

Change-Id: Id339737e93fedf20a36a70d45ad5f11db50f7643


Trivial merge