Merge "Fixed speed dial remove." am: 6e1516d525
am: ce888e200d

Change-Id: I37c3c24f9333b83a5020a463e49b13c8e1025a4a