Merge changes from topic "am-8a210e51153e4e63bbaa44ae9cf03391" into oreo-mr1-cts-dev
am: dedfb2ca1f

Change-Id: I5d7e0f0a8b8c2596e0e70b5b1fb847ea100fec44
tree: 4dc73dbab6acb2851f5ad24beb73edb13278a932
  1. tests/