[automerger skipped] Fix some small flaws in Call Redirection service am: 1fe06dda
am: 03cbfd97 -s ours
am skip reason: change_id I3e44eb941faf12124d1ae2db25d66e0de48d6478 with SHA1 79732b61 is in history
Change-Id: I74c7373e0b3bc976d5d7a94bdcc824407dea47c5