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

Bug: 120848293
Change-Id: Ibf99e334a75b5437686e581f5a181767b7e9eedd