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

Bug: 120848293
Change-Id: I8b21f8d07c267b6bd1dee61f0bc332ca62a1e22d