Merge "Fix test failures on API 22" into ub-contactsdialer-h-dev