Closer to NFC

Change-Id: I3098f0c206be00a38703236c7315b0d921f3469d
5 files changed