Merge change 27234 into eclair

* changes:
  Fix http://b/issue?id=2106682 (Don't show status if we don't have it).