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

Bug: 120848293
Change-Id: I4ac749387dca39a09e96ea5588b651d06728033b