tree 5baaba8186b08f1f2f0497e6f5af322f169489a9
parent 09ef7ca1c228ddc2bef3c6ac6c8ed9f7a5391664
parent acc2b99fbca067b97cce1a214084a0ed29e3e4b7
author android-build-team Robot <android-build-team-robot@google.com> 1550616028 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1550616028 +0000

Merge cherrypicks of [6452478, 6451642, 6451643, 6453811, 6451644, 6451645, 6453831, 6453851, 6453852, 6453853, 6453854, 6452479, 6452480, 6452481, 6452482, 6452483] into oc-m8-release

Change-Id: Idf6f62c5129af560787f0f496a97ba2ffab87671