tree 0f6a5396e8c1b2dadf87e17cd8a0e06e61d40fac
parent a4cf11af14ec5a768a03e5d446ed8234cb67948b
parent 3f8d498c506cc128922c2c1edf77cb821027c846
author android-build-team Robot <android-build-team-robot@google.com> 1544218992 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1544218992 +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: I3fdb8b1624ad46b730a5c5cd69f0b05a19b28605