am 6cc64cd2: Merge change I90b4c0e7 into eclair

Merge commit '6cc64cd26d1ce9319dd2f430b564b8b2de9b482f' into eclair-mr2

* commit '6cc64cd26d1ce9319dd2f430b564b8b2de9b482f':
  Fix Eclipse sample tests.