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

Bug: 120848293
Change-Id: Iab79e0e878596297ab91b43d55389cb1cf0f62a9