Merge changes from topic "am-df79034a46694ff0b7e47fa7f8bf9120" into oreo-cts-dev
am: de16c72207

Change-Id: Icf89210178c6b524949fb26dced2fb58081b7ab0
tree: 8919bc3ae0943bbaa43f4381d20654e20438ba86
  1. tests/