Merge commit '781c0aa21ed1e4a38dc3ec1a5facc7be48386571' into gingerbread-plus-aosp * commit '781c0aa21ed1e4a38dc3ec1a5facc7be48386571': NFC Settings cleanup.
Merge commit '781c0aa21ed1e4a38dc3ec1a5facc7be48386571' into gingerbread-plus-aosp * commit '781c0aa21ed1e4a38dc3ec1a5facc7be48386571': NFC Settings cleanup.