am 0e5b3d4e: am a27523e3: Merge "Fix for call timer resetting when starting...
am 0e5b3d4e: am a27523e3: Merge "Fix for call timer resetting when starting IMS conference call. 1/4" into lmp-mr1-dev
automerge: c7105c46
* commit 'c7105c46':
Fix for call timer resetting when starting IMS conference call. 1/4