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

Bug: 120848293
Change-Id: I3dd7fcb8988c34ccc5130e743604a7eb43bbd945