Merge "Fix potential NULL dereference" am: ccf56a09ee
am: 485046c66a

Change-Id: I685e35e87773d789a543f116f1277d63f53bb42f