tree 77bc10a0a695b2788490c3b60ba242567e8733e4
parent 0770fd0ae8f2e8cc02f8619ea2e6fe73b09167c4
parent 8a1670cd2f7ccef786274711d24663509f669268
author android-build-team Robot <android-build-team-robot@google.com> 1521757168 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1521757168 +0000

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

Change-Id: I110b3f8bd768c30e0f80c7d99a19a26bed517141