Merge "Use classnames instead of ints for NFC techs." into gingerbread