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

Bug: 120848293
Change-Id: I8448ca742ff6023b37316d26b96eb82f8319a2c6