Merge changes I44879d17,I3d7a4461

* changes:
  Validate suggestion during adding process
  Handle null when matching passpoint suggestion.
tree: e6653b57b232f20db8c0f63ebfd6a075d8bf60a5
  1. apex/
  2. service/
  3. PREUPLOAD.cfg