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

Bug: 120848293
Change-Id: I89d4f3c6edfb7a41db96635731be96611b4beb36