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

Bug: 120848293
Change-Id: I30c7e5c34161b822f1327d01bdbfe4ac7dd31258