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

Bug: 120848293
Change-Id: Iad59e7fee0d856ebce88169f08ee98ae6ed013f3