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

Bug: 120848293
Change-Id: I4dc8aa5a9d478609218d3b10674674d2effe7451