Merge "Merge changes from topic "am-19d0b20ea6e84d16b2530475ea505475" into oreo-mr1-cts-dev am: d1f18aeba3" into oc-mr1-dev
am: 51ac8fbe5a

Change-Id: If8e8b4d297ea849f58ba95841021993bb441b171
tree: 707c36f79dc5fd1297e2f970ac6d9f6c5a33e571
  1. tests/