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

Change-Id: Ib7210f7529d9c6dba5b601bd3e47dd612cc64598
tree: 0d5b86e47b0e392dd53df20076168792b95573a3
  1. tests/