[automerger skipped] Fix NullPointerException.
am: b4bad064d8 -s ours
am skip reason: change_id Ic007e44264647793c6271c3923c13c9e1736a9de with SHA1 17bfed91cc is in history

Change-Id: If77c223bce798c1d09f38f791f8aeca494a33324