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

Bug: 120848293
Change-Id: I737cd5b104d91809e0174e8b8340f2f4e0d8c56b