Merge changes from topic "am-96d8ccc4e1e44c30aec62bb030c6529c" into oreo-mr1-cts-dev
am: f0c2985ba8

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