Merge pi-dr1-dev to aosp-master am: 394eb13546
am: b12ac32195

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