am 9811d6b1: Merge change 8298 into donut

Merge commit '9811d6b1f2be41231176236c78ec0d8d512215d0'

* commit '9811d6b1f2be41231176236c78ec0d8d512215d0':
  Minor NPE fix.