tree 16f67bdf876ba3bf3a9713fbc7f9ba793450d7ca
parent e46f113b9041119f66b29d19451f9c7544ad1761
parent d8f320f69d513be56c31e68359068d7ba21eb20c
author android-build-team Robot <android-build-team-robot@google.com> 1552508083 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1552508083 +0000

Merge cherrypicks of [6714499, 6716593, 6716594, 6716595, 6716596, 6716597, 6716977, 6718226, 6717773, 6716978, 6717663] into oc-m8-release

Change-Id: Ieb4c3a0b3350852b8db4c4638b35fc2c6f6ec362