Merge changes from topic "am-3206387c023d4f72a961a49cfd1ef4e3" into oreo-mr1-cts-dev
am: 105ca148a7

Change-Id: Iac57e88088eeb4a12c52e383c33a11a4a30adb1a
tree: e853df38a4cfac445da5c8c09439d780ca49595b
  1. tests/