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

Bug: 120848293
Change-Id: Id4d5cc26b24283fa8317117b4f6a266bccafcf19