Merge "Fix another nullptr dereference." am: 331d8e9b1a am: 5ead5f7df9
am: 1a57a08bb5

Change-Id: I7bc7e44f821504b9668de3d283dff088c140f42f