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

Bug: 120848293
Change-Id: I4029675ab6a04d36baf8a44fa4aba3453b38a1c0
tree: 8e06d37f06b0854e2c34601af693fc02c6166a2b
  1. tests/