Merge change I27666897 into eclair-mr2

* changes:
  Make robot.png a raw resource.