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

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