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

Bug: 120848293
Change-Id: I8f3e65c59d32019870354f9e17626c85670efa8c