tree 1a3105eed4693118de4f0745a4d43bda461ef826
parent 6cd85e2a89347e0a107f59e38ece61fa19e6da78
parent 642f66b9c95f369fef556c1668582794ec4dbbf6
author android-build-team Robot <android-build-team-robot@google.com> 1506036830 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1506036830 +0000

Merge cherrypicks of [2937968, 2940489, 2939606, 2939607, 2940434, 2940435, 2940436, 2940437, 2940509, 2940510, 2940118, 2940119, 2940120, 2940121, 2940122, 2938726, 2938728, 2940550, 2940552, 2940554, 2940556, 2940511, 2940512, 2940513, 2940514, 2940515, 2940558, 2940649, 2940650, 2940441, 2940442, 2940559, 2940560, 2940561, 2940562, 2940563, 2940564, 2938336, 2940565, 2940566, 2940516, 2940443, 2940517, 2940444, 2940445] into oc-dr1-release

Change-Id: I63e94e2e1bdd2a2748fdc1df70db3e439e806862