Merge "Changes in comments" into ub-contactsdialer-a-dev