Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev
am: 16af42313d

Change-Id: I7568d330852e6b103af5aca99619cda9cfefa8d8
tree: 4b52b3db297b78c2c6547af0730d92e6f6ef1987
  1. tests/