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

Bug: 120848293
Change-Id: Ic79177d63df2e7972e36b125ff579f49cfe90c95