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

Bug: 120848293
Change-Id: Ia41c9f95e7aa5f33fbebaab88311dc28ecba6dde