tree 640eda727e648a7aeaa7ab8fb6254575081e504d
parent e31f6eb5c49e0e638585243ac36ce139b60a6fb1
parent e6eb42cb2e57747e52e488d54da314bc6eabb546
author android-build-team Robot <android-build-team-robot@google.com> 1539966302 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1539966302 +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: I6fb2bf1fb11d79b60303b6c9525543c041e3a8d0