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

Bug: 120848293
Change-Id: I92822048a7862acaa669847b2fa9c8f708159952