Merge "Framework changes to support NFC trustlet."