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

* commit 'a9a50fef97d388ef5fb06a5953caaa79ab16496d':