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

Change-Id: I8911bbc38a09b7222d67736a9271bfc31c1beba4