Merge "SIP: add config flag for wifi-only configuration." into gingerbread