tree a64fab383c73877ab08112ce265faf0ba2761bc3
parent 50efad1c46df467ca34e2a0e0cadc3154f8ce3a5
parent 1e19b57d83b3952d79865c08624491b49ea68f63
author android-build-team Robot <android-build-team-robot@google.com> 1542669690 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1542669690 +0000

Merge cherrypicks of [5556008, 5556009, 5556010, 5556011, 5556012, 5556013, 5554791, 5554792, 5554793] into pi-qpr2-release

Change-Id: Id54d441b279a0b34f54da8c742f4696f7eb46b31