am b13fe892: am a9a50fef: (-s ours) am 4854e292: am ad509fd4: Merge "Fix potential crash"

* commit 'b13fe892d82a2ccde3e338c426b6cf70aea1e564':