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

Bug: 120848293
Change-Id: I4d50e4ddff59fc773080deecc777b43a3f1ced5d