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

Bug: 120848293
Change-Id: I7e2c069a43748c95be376e784ee152f3f4a88c5f