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

Bug: 120848293
Change-Id: I38bf95211e9e25ff919ac7260cc7822bdaee7948