Merge changes from topic "am-fda3e51b99ba472293e34273b3249d2c" into oc-mr1-dev-plus-aosp
am: 1f8146c8f0

Change-Id: If5b23f50ff5324ad7ea0d244424a04ee63ca10d8
tree: b576f546f237f9b09763a608014a1417f3e449f4
  1. tests/