Merge "Fix potential NULL dereference"
am: ccf56a09ee

Change-Id: I6476a47b0f5d28731d858cfcc32eb489750e20f1