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

Change-Id: I080a44e509499dbe43048d67f489f3fd8ca0cdc1