Include NFDate

Change-Id: Id26ff6de5128d76b36acf6f2ede4de39e3518caa