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

Change-Id: Ic129a3fdff54705ba345cd032a0b17ce502ac5c9
tree: b53495e92865492a34e0e2d638e634844734da92
  1. tests/