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

Bug: 120848293
Change-Id: I64ed41f424f7e32070143cbdc1a29586b25b0845