tree 11d5e9d6bbaef903597d9399008459a678b834c7
parent f994033f998c0bd5f8815f151a648087e9b7a4f4
parent 234fb033a3bf4b93cf7193db5b84a625a3da8546
author android-build-team Robot <android-build-team-robot@google.com> 1521751369 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1521751369 +0000

Merge cherrypicks of [3782287, 3782954, 3783025, 3783026, 3783027, 3783028, 3783029, 3783030, 3783164, 3783165, 3783167, 3783168, 3783170, 3783171, 3783172, 3782288, 3783031, 3782196, 3782955] into oc-m4-release

Change-Id: Ie9d46f0dda338422c5e1328aba53f5b7bb618625