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

Change-Id: Iece01d3b92b031d55b201a9964c62ef8206330fe