tree 81f4894bdfacddfdd3711b025c469e5e85e93238
parent f6b75ad93af8a9d96bb7eca48400d9f14f9092f0
parent ffe9a48cef3a1d781fb339066633483d66df0778
author android-build-team Robot <android-build-team-robot@google.com> 1544219004 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1544219004 +0000

Merge cherrypicks of [5745882, 5746123, 5746124, 5746125, 5745544, 5745819, 5746700, 5745883, 5745545, 5746720, 5746344, 5745884, 5745885, 5745886, 5746740, 5746741] into oc-m8-release

Change-Id: Iff7f6320f56051ed0b396c521e65d2cb02cffbec