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

Bug: 120848293
Change-Id: I68b32ed3587b817251f466d9306ed1119e453f7f