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

Bug: 120848293
Change-Id: I20fe6bf9c050d7ca0cdd255bccaaa6c5e2a6ee34