Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into oc-dev
am: 7fc94d02ca

Change-Id: Ic222e3a15f1aa60792a7befa6423e97d12c23fac
tree: b200fff2914576bdb3d59836b60e90f4adb0b12b
  1. tests/