Merge changes from topic "am-ef41260469b74ed484092f80fc943840" into oc-mr1-dev
am: 73a2c644b7

Change-Id: I2566fc1242d2b3c73e951e4fd30264a7439a8411
tree: 80ca5489f3519d96804a56addbea9ee72ff5ec88
  1. tests/