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

Change-Id: Ibd1dc1c5eca49cd0261693018598a6df2983eeed