Merge "Add register methods in CallManager "do not merge"" into gingerbread