tree ace8793acff44b737cc0d3ee7c1f8acebd32b692
parent b067667febe9721601754c7102638d963a99777d
parent 6b121de98b1e3a85e83f6822b6fd35a62ee09ea1
author android-build-team Robot <android-build-team-robot@google.com> 1547665040 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1547665040 +0000

Merge cherrypicks of [6072696, 6072074, 6072757, 6072120, 6072121, 6072122, 6072123, 6072575, 6072576, 6072577, 6072578, 6072579, 6072193, 6072131, 6072194, 6072076, 6072210, 6072759, 6072760, 6072698, 6072699, 6072700, 6072701, 6072702, 6072703, 6072704, 6072905, 6072906, 6072907, 6072761] into oc-m8-release

Change-Id: Ifd5ee3a1219b7a794619b82ad4bd3c6828689634