Merge remote branch 'cm'
TRDS: dialer update