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

Bug: 120848293
Change-Id: I799c89cea9ba56bf0c78695cd079f304e0479594