Merge 78b79433665f8aa05097e9429b770bad00aa2de4 on remote branch

Change-Id: Id576e12d2e565b37a99f36b7df66191746fce206
tree: 8632ae51ec700f5e3f8a61df67f8fc52981887e9
  1. iorap/