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

Change-Id: Ifd8d134ac97ba7138118a2b56bf08f2befc4083a
tree: 0d5b86e47b0e392dd53df20076168792b95573a3
  1. tests/