am bbe41b55: Merge change I4bd71b0f into eclair

Merge commit 'bbe41b551cc5e8d183a547962c552e1382065f89' into eclair-mr2

* commit 'bbe41b551cc5e8d183a547962c552e1382065f89':
  Fix http://b/issue?id=2203681