tree 46e1a76e378c9f2bd444d36bc4c8e5255f59a38d
parent 5408c2c4543ec221d39aadda06b79efb3119c7b8
parent 6f6d220a3255e7cbd31bcd1220ffb83af0a2779a
author android-build-team Robot <android-build-team-robot@google.com> 1539966293 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1539966293 +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: Idce282dba178e5a8ba5069ae33f24951f612accc