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

Bug: 120848293
Change-Id: I4f96f8351b170c9b438079080c7a3885237f1cf8