am 1c35d178: am 95ebd3bd: Merge change 25847 into eclair

Merge commit '1c35d178cba11a97ec8184d30673c84acb691624'

* commit '1c35d178cba11a97ec8184d30673c84acb691624':
  Fix http://b/issue?id=2099487