am 3a032856: Fix http://b/2248037 .

Merge commit '3a032856e7adc7bbccf165e8c0eeb86a38bdc57b' into eclair-mr2

* commit '3a032856e7adc7bbccf165e8c0eeb86a38bdc57b':
  Fix http://b/2248037 .