tree fda3190125995e478fe5dfb9599c12515e9e0d9d
parent c514b08c1074c95d72acac64759f8e614b4d1d85
parent 7cc2085e7ee20c950a6ad37a9619dc8216ff75e6
author android-build-team Robot <android-build-team-robot@google.com> 1535148054 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1535148054 +0000

Merge cherrypicks of [4871059, 4868580, 4869372] into pi-qpr1-release

Change-Id: I9c8f77bf25e97f0f906ea31474f3b492d1dd3a04