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

Bug: 120848293
Change-Id: I86aba9e754140f776fc1ed49c54985752687f305