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

Change-Id: I176a7a6298802e8f837bfb2eccfe4e8427907169
tree: 4dc73dbab6acb2851f5ad24beb73edb13278a932
  1. tests/