am 8423a177: Fix http://b/2249983 .

Merge commit '8423a1772b340c02e07c066b646baeae18521fe7' into eclair-mr2

* commit '8423a1772b340c02e07c066b646baeae18521fe7':
  Fix http://b/2249983 .