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

Bug: 120848293
Change-Id: Id1fe73c25747ecb80736f2ba93fb7bbe2027760e