DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I366df6ac16a90ebb14956fbbebb654dd7ba64f7d