Merge "Fix "Dereference of null pointer" compiler warning."
am: 18dc831e66

Change-Id: I416975454087a747946f55706bce70a7faa6b255