Merge commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1' into gingerbread-plus-aosp * commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1': NFC settings cleanup.
Merge commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1' into gingerbread-plus-aosp * commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1': NFC settings cleanup.