tree 074baa0ce277b48a799b7e805eb263b91a443334
parent 2b9c0df5ebcb5a5e7196e447f2b71d27e644dabd
parent ce32be484fed68df208c01a607ccc2ba09830f7a
author android-build-team Robot <android-build-team-robot@google.com> 1510539321 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1510539321 +0000

Merge cherrypicks of [3215323, 3214370, 3207446] into oc-mr1-release

Change-Id: I12fe31ca45193e61e33e1c1786b589cd24c5a6dc