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

Bug: 120848293
Change-Id: I1578ec735c9cfff83988cee52b552b74890f5e3f