tree 1c4183e8ce3d2dbba5bfd2312ccfa470b53e2d58
parent 2955976c0570a9e279ea89f99d3d9a829e89df33
parent 0e535fc9752863a9d492df1aa070568b6d1c67cd
author android-build-team Robot <android-build-team-robot@google.com> 1521757197 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1521757197 +0000

Merge cherrypicks of [3783687, 3783705, 3783726, 3783751, 3783752, 3783607, 3783727, 3784084] into oc-m4-release

Change-Id: I3dfd2956128a2e17b20b451fc045bbc4e2a18dd6