Merge "Move udfps-specific config to device config.xml" into sc-dev