am e57ca0ec: am 4854e292: am ad509fd4: Merge "Fix potential crash"

* commit 'e57ca0ec07f357a1ef38d9a7439ea080bada4e74':
  Fix potential crash