Merge changes from topic "am-177bacee3d764303895ed5e1e72bf859" into oc-dev am: 2f8017a25a
am: 5af7a7290f

Change-Id: I49efdb80338f5a1638e4a147d33c73892ddff957
tree: 6678dc9f5bb443088e8c2046cd627cef5bc101b2
  1. tests/