Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev
am: fa209394f0

Change-Id: I3fa858e8b4a2da17f89f544b1ca802de84909830
tree: 6678dc9f5bb443088e8c2046cd627cef5bc101b2
  1. tests/