Merge changes I64bf55bb,I91e80704 into ub-contactsdialer-h-dev
am: c281ad0188

Change-Id: I6d1238a1f5b9e700632ea44279de29ccd96c93e6