tree 410a56adb754ea0b4c40a6a9d72241d3faf3a22d
parent dee91a1e13957137ee3e4d02af760909ce5b36ca
parent 73afaab6202f19833926e9ca532775b833f780d9
author android-build-team Robot <android-build-team-robot@google.com> 1509115856 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1509115856 +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: I71818f1f6c71254f439f041366a8724ad9a6d49a