tree e676fb83b32caf68233128e852fa2083d9b5d7c7
parent 5c5e31bc64538c4da54dad0b91cc1ec1426bb040
parent 4e6a6006254bd261d4784bb335225235e2739de4
author android-build-team Robot <android-build-team-robot@google.com> 1521757173 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1521757173 +0000

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

Change-Id: I3f98004273dd3f6e8226fb1abe71c0773a35dc4c