am ff2be674: am 15470bf5: Merge "Fix for call timer resetting when starting...
am ff2be674: am 15470bf5: Merge "Fix for call timer resetting when starting IMS conference call. 2/4" into lmp-mr1-dev
automerge: b0c98c67
* commit 'b0c98c67':
Fix for call timer resetting when starting IMS conference call. 2/4