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

Bug: 120848293
Change-Id: I399cf437a1e9448dda862a7290b7395680fc201e