tree cff66b98b0643ab62065c3b73e52d73d2ba8963e
parent a9872432b247e3a18888c564808c5e25db98dfb3
parent e8b0a7a6a25bae5e9e3e5e164176b35c125f7090
author android-build-team Robot <android-build-team-robot@google.com> 1539966294 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1539966294 +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: I6327a639b66247a2130a1abb86bdfc6b7c12d6b2