Merge change 25847 into eclair

* changes:
  Fix http://b/issue?id=2099487