Merge change I272af007 into eclair-mr2

* changes:
  a possible fix for the bug http://b/issue?id=2200637