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

Bug: 120848293
Change-Id: I05100abf98a2f86cb68d8eed1378183b24e8aa02