Merge changes Iac8979df,I3c0a6823 into oc-dev
am: 16e262b132

Change-Id: I602b468afdab41de50851bc833e5e35bfff1da31
tree: 7f728af4c8af6e9a2ed1cc2f68d96cc201be3d89
  1. tests/