am 65d74d19: am b3c6951e: Merge "Fix Dialer tests"

* commit '65d74d1987732bdc36def7b06f83bc5d2a66eb0f':