Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev
am: d9aadde604

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