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

Bug: 120848293
Change-Id: I425513c10d4b8fdbafe54308500ebfabe20cf672