tree 1c30c6add9880e38509e2a6c07b6d29726f04f9c
parent 1797c6976fdc4e475a5fcba18ede7fde395ea21b
parent 04675d7781c99cb68e41c251645b2df0ff8d81e5
author android-build-team Robot <android-build-team-robot@google.com> 1540587466 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1540587466 +0000

Merge cherrypicks of [5371217, 5371218, 5370861, 5369688, 5370512, 5370513, 5371204, 5371205] into pi-qpr1-release

Change-Id: I9e0dd4a5cedf8eeba4a67c49e7fb4e93c7ce21ad