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

Bug: 120848293
Change-Id: Iec72f8821d18ab25cd91064df74904386379583c