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

Bug: 120848293
Change-Id: Id8dbb97bac9a5706bf1f166db7f1f00865b3ab79