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

Bug: 120848293
Change-Id: I0da587eb27f6a016e58ac4644f5ee9af247e1333