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

Bug: 120848293
Change-Id: I0de288c970da7873dbc7147a29ddebe6376762d5