Merge changes from topic "am-325cd506-a538-4cb7-a65c-bc30576c59e9" into oc-dev
am: fb27c032ff

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