tree 0a24a1a8d45e06a676aad80c882818c9e0cdbd64
parent f9cc11e67404de650a8a03f884b55493f43ff307
parent c97efaa05124e020d7cc8c6e08be9c3b55ac4ea7
author android-build-team Robot <android-build-team-robot@google.com> 1539966284 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1539966284 +0000

Merge cherrypicks of [5313339, 5313437, 5313318, 5313340, 5313282, 5313283, 5313438, 5313284, 5313341, 5313379, 5313380, 5313319, 5313320, 5313321, 5313285, 5313286, 5313287, 5313497, 5313439] into oc-m7-release

Change-Id: Ibe3905ac5412e3ff32a8687d005a15d17a1c13e0