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

Bug: 120848293
Change-Id: I1fbc854ec297abc3f113f2650567f27de8623d73