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

Bug: 120848293
Change-Id: I8167f81205096f395ea1bad7b6225e408ca93408