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

Bug: 120848293
Change-Id: I9cd4df4c99ff8c911aec723e769feaa522d6429c