Merge pi-dr1-dev to aosp-master

Change-Id: I7cd9310e06805e7d2b70a53873f5f0e235c0ac38
tree: 3d0c0fd97519bfc8a3df5b3aaf09f3b88212e40c
  1. tests/