am 596d1003: am 93b459be: Merge "Fix NPE. Ensure favicon behaves consistently with other tests." into jb-dev

* commit '596d1003ede7918151b072d28c93fc542f4c1c93':
  Fix NPE. Ensure favicon behaves consistently with other tests.