[automerger skipped] Add null check in nfa_ce_deactivate_ntf am: 01c4b6ba5e am: 7a8da345c8 am: e55ac4a0e5 -s ours am skip reason: change_id I71a933efa2c81c5f73d56af6d712c7d72b6f2fac with SHA1 7b56ca7cc3 is in history Change-Id: Ib97d3d9e86988294b70ab7c8bd1c9477d33c903c