Merge changes from topic "am-255f7edfcc6f4ec1a5498250fdcf0dc9" into oreo-mr1-cts-dev
am: f095afee74

Change-Id: Idff151e5b917ffdcd35cf25a674ba42f1903ca51
tree: 4b52b3db297b78c2c6547af0730d92e6f6ef1987
  1. tests/