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

Bug: 120848293
Change-Id: If391160e3e0562b39dbbc380ac8e15bc8ebedd91