tree 3a0712541de17b5b12fbc789e43ffcf50807c10c
parent ef995715618c070388ab8022c6d7e729645b6530
parent de0bbf0bba297afe1c9bdde50f40f8872fb2f9d1
author android-build-team Robot <android-build-team-robot@google.com> 1543252845 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1543252845 +0000

Merge cherrypicks of [5610460, 5610582, 5610249, 5610250, 5610113, 5610163, 5610980, 5610981, 5610982, 5610983, 5610984, 5610461, 5610462, 5610463, 5610464, 5610114, 5610076, 5610985, 5610986, 5610251, 5610583] into oc-m8-release

Change-Id: I910aadfb7765600ef5657151faa4f622b062c265