am 02062f44: Merge change 5391 into donut

Merge commit '02062f44ff929cf635d0523f9f93ffa69d182899'

* commit '02062f44ff929cf635d0523f9f93ffa69d182899':
  Fix an NPE.