am f53716ed: am a1f084e8: Merge "Fix NPEs in StatusBarTest." into jb-dev

* commit 'f53716ed9e544c3042813d70383bdc23c7b00a77':
  Fix NPEs in StatusBarTest.