Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into oc-dev am: 7fc94d02ca am: 52d573a044 am: 91014e8da2
am: 9ca1b80cd2

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