am abf67e1b: am 423cc45a: Merge "Fall back to NDEF push if handover SNEP get fails." into jb-dev

* commit 'abf67e1baa0a4b313d9338e69261db47c33725be':
  Fall back to NDEF push if handover SNEP get fails.