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

Bug: 120848293
Change-Id: I6522cde7954179ef310c0e84395582ab00a002e1