tree 3c5e99c6009fcee8130f34ad4fe0e5215306b3a4
parent 3c2c834a93d7e0a9d1d21a2c2079d2385d5694db
parent 6033d76bc68c04155dfa763ac86a229169d78cfb
author android-build-team Robot <android-build-team-robot@google.com> 1534382468 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1534382468 +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: I601b76d218a5f03fb1506cbd22a2c9d2cec85469