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

Bug: 120848293
Change-Id: I7091757b001b13627cce6fa1e45b331ba3ff77ee