Merge changes from topic "am-a8c42e83471740dd9885d0dcccdf8907" into oreo-cts-dev
am: afff62b0b9

Change-Id: I0ffdf433f50d14f9b2000eba363e5252a2b3e93d
tree: f053791b2ab65c58895d16b53dad660248e0a11b
  1. tests/