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

Bug: 120848293
Change-Id: Ida898b7192b54c33fb95e0e0798bb3f96dd20eba