Merge "Fixing bug with setting the emergency call time."