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

Change-Id: I551f40409aed0a18e82500af15e912d0250b0545
tree: b576f546f237f9b09763a608014a1417f3e449f4
  1. tests/