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

Bug: 120848293
Change-Id: I6296597cd23f6525fca9109a7e9e6d4795352e9e