Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev
am: 1c90ff8dcf

Change-Id: I0856e123ead2e4b075c693f68874354e51572988
tree: 60d198c6bc42d67433853e97c225e2af7a0ad4bc
  1. tests/