Merge "Fix warning: Called C++ object pointer is null"
am: 5d26ace4fe

Change-Id: I0dc3cb0f848fd0b90a3e20993b64bcf899656e6e