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

Bug: 120848293
Change-Id: I8499849b83acf913ff48b1783fc379d7b86378fb