Merge "Fix potential NULL dereference" am: ccf56a09ee am: 485046c66a am: 473419175f
am: 1b70bf908e

Change-Id: I5e2f0eb5a7acd7cf1d0b30ef70314943e18d8bce