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

Change-Id: I0d3c8f6eb580656405543377dc073ae116661bc7
tree: 75a10edf72cfba28d92b04107c06e95e30e16732
  1. tests/