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

Bug: 120848293
Change-Id: I88a77c095b08d7b0389cf8fd295cc8d26a5618c1