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

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