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

Bug: 120848293
Change-Id: I149b96a58adf9d187cdf2ceddb3bcdc2d485c00a