am bcba2182: Merge "check ntpserver as empty string instead of null" automerge: dbcb4a1 automerge: 387da77

* commit 'bcba21827c836e8941719b432fbf11d1bb8e8639':
  check ntpserver as empty string instead of null