am 73972695: Merge change 4925 into donut

Merge commit '73972695c844b25370ad738bb76e8eb2e9cd81e6'

* commit '73972695c844b25370ad738bb76e8eb2e9cd81e6':
  Fix 2 NPEs in the Browser.