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

Bug: 120848293
Change-Id: Ifd4160584fb631ba8cefadc7d104a5c4057f2abf