Merge "Revert "Fix integer overflow in NDEF_MsgValidate."" into oc-dev am: 9dcb83d4 am: 8a359837 am: 239ff6c7 am: c9fa58c4 Change-Id: If06e406f85b6c0217b34834c52764b6d02768dd0