tree 2ea54e42c0568fd844c66202f5b785e305398363
parent 2963cd41f64fab200684eae8097aaf529d0d3984
parent db0f5100c9bdf8d0d26554f8e4aa3d4238757cb3
author android-build-team Robot <android-build-team-robot@google.com> 1518211724 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1518211724 +0000

Merge cherrypicks of [3594034, 3594272, 3594273, 3594274, 3594275, 3594347, 3594035, 3592471] into oc-mr1-release

Change-Id: Id0214b5206fd01da1829b1475cef34ecac46f4e2