Merge "Updates for NDEF push API change."