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

Bug: 120848293
Change-Id: I9b93a25996af28d58cdfb4ae5148f3c0f5cf16c3