tree b73fe3a4f35422ec79e386953d600a333b665ffd
parent 541277be890df94cb6dd93597e9ab66f794ffa31
parent f7270c2008902f373058e6e06052fc493553866c
author android-build-team Robot <android-build-team-robot@google.com> 1537827407 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1537827407 +0000

Merge cherrypicks of [5098694, 5098695] into pi-qpr1-release

Change-Id: Ia32be6c3928d1fbe2ddd34e1f4301f5f8ea81da4