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

Bug: 120848293
Change-Id: If57df495fad14bfe6b90d36c0639a06036bf7731