Merge "Define Nfc statistic data atoms" am: 961a43eae2
am: 20548152f7

Change-Id: Ie72691a9bbdc505497c4cc99a1feadcc088a1baa