Merge changes Id18f3e9f,I737736d6

* changes:
  Add additional fingerprints suggestion
  Add wifi calling suggestion