Update NFC for 4.3

Change-Id: Ibddf71a224155c60ae2d3e7851ae555bd8664310