Merge changes from topic "am-ab809732e70048beb4646f9609db691c" into oc-mr1-dev-plus-aosp
am: 513080c4d3

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