Merge pi-dr1-dev to aosp-master

Change-Id: I7cd9310e06805e7d2b70a53873f5f0e235c0ac38
tree: a9227bd621b872273bc72635f743dd2ac2cddebd
  1. tests/