Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev
am: 16af42313d

Change-Id: Ia6fafc0f95b4160da31f6015b59fc0ab79e766c6
tree: 75a10edf72cfba28d92b04107c06e95e30e16732
  1. tests/