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

Bug: 120848293
Change-Id: I546f31690b4aa9b20be45e04d35d757294666365