Merge changes from topic "am-78d56b92e8374ea69d3020f927cd3a08" into oc-mr1-dev-plus-aosp
am: 11c9381256

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