Merge "resolve merge conflicts of 5b2571349 to oc-mr1-dev-plus-aosp" into oc-mr1...
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 5 Sep 2017 20:15:32 +0000 (20:15 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 5 Sep 2017 20:15:32 +0000 (20:15 +0000)

Trivial merge