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

Bug: 120848293
Change-Id: Id81fd23eb6b37fc7e321ed88cf976bc1b0a3aa13