Merge "Fix a nullness warning."
am: b37e81d3cd

Change-Id: I0393f42a1d2a0e73e0c29a0e0047479f49982788