DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master Bug: 120848293 Change-Id: I0e036a7bf94fe971003fc16e1fdb356e8508a920