Merge "Fix a stupid NPE" am: 72746119bc

Change-Id: I3a167339e4007e5cb16488e701b9ca16937da265