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

Bug: 120848293
Change-Id: Ic2fb4d7f00d9c3d38039bdcbdc112fa0a9b21d71