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

Bug: 120848293
Change-Id: If5573bee0be4e88309267ed026d9676e623c19d1