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

Bug: 120848293
Change-Id: Ibfd8d9e266346b5ac30b9b6ff555292526f31e32