Merge changes from topic "am-26881935e2b34994a556637dd980465e" into oreo-mr1-cts-dev
am: 36407c961d

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