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

Bug: 120848293
Change-Id: Id6f969f98511422bffbfb9ebd12a552ac1d9f99e