Merge changes from topic "am-577c7e51c7294d17a1c29c24e9664b0a" into oreo-mr1-cts-dev am: 666f941b5a
am: 4f668aaf31

Change-Id: I13e5bc319ccb23312d415da56e8d9e3db1eafde0
tree: 80ca5489f3519d96804a56addbea9ee72ff5ec88
  1. tests/