[automerger skipped] Fix NullPointerException. am: b4bad064d8 -s ours
am:d0654a76f3-s ours am skip reason: change_id Ic007e44264647793c6271c3923c13c9e1736a9de with SHA117bfed91ccis in history Change-Id: I599503bfff056e4be9619ac7176588fc2ff97dd6
This commit is contained in: