am b04f9944: am 22580b83: Merge "Fix potential npe"

* commit 'b04f9944fb0062541512447a952405ba4b084d30':
  Fix potential npe