tree a168cfb9ab9f8a9b959d15105072d24191d1f3ac
parent 23dea08fa7bf4651381ceea1916afd24c6234987
parent a5f1a7c5c75ad487b8a2e2bb4575b0e9ef28d453
author android-build-team Robot <android-build-team-robot@google.com> 1534382453 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1534382453 +0000

Merge cherrypicks of [4787603, 4787134, 4787604, 4786834, 4787135, 4787488, 4786835, 4787489, 4787490, 4787548, 4787549, 4787550, 4787551, 4787552, 4787553, 4787502, 4786836, 4785839, 4787620, 4787621, 4787622, 4787623, 4787624, 4787625, 4787626, 4787627, 4787628] into oc-m7-release

Change-Id: I9004af9812dd7b16f682f4a8904019366dfd473f