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

Bug: 120848293
Change-Id: I0cc6e7a2bca9f6e5ec47636c40fac33661b24f76