am 788788cc: Merge "Check null condition of number before contact query" into klp-dev

* commit '788788cc4a56eed314675314447c2ce240417233':
  Check null condition of number before contact query