tree 1343a07368deb3a742de8a228e3ab97f070b5ed1
parent 9cc4fbdd6481ed744d319cbfa0150dfc6d44e725
parent 05a65e4026051dd8bec598fd50d40f4825ebf7b6
author android-build-team Robot <android-build-team-robot@google.com> 1509115805 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1509115805 +0000

Merge cherrypicks of [3134552, 3130583, 3131953, 3131954, 3131955, 3131956, 3131957, 3131958, 3131959, 3132062, 3132336, 3131074, 3133939, 3131024, 3131025, 3131026, 3130584, 3130879, 3130880] into oc-mr1-release

Change-Id: I1aef5d261605e55125347c191a77322552cca188