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

Change-Id: I1f9a8d36b810c58a435d88f1acc19e61ed9bdd56
tree: 219221332091c3c7eda90af2dc9472a276e1d31c
  1. tests/