Merge "Update for NDEF push API change."