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

Bug: 120848293
Change-Id: I6e5d03f4792547bf0b2a04e52d5b5b25637d47ac