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

Bug: 120848293
Change-Id: I3600273a47b14e564ebd90ab6d0c1db1cfa8953b