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

Bug: 120848293
Change-Id: I72b21d1e5d9fabbdffa3f6451125accd835cc4d0