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

* commit '4854e292e0cd0eb58bce4488dc849273904d9302':
  Fix potential crash