Merge "Fix incorrect Conference time for IMS conference calls." into m-wireless-dev