Merge "Backport cl/159625495" into ub-contactsdialer-k-dev
am: 6a7775318d

Change-Id: I05ef784d85f64881ba721abb697679778d716460