am 570c0b79: (-s ours) am 118b5b03: am 7b3b10b6: Merge "Clean up todos in Dialer" into klp-dev

* commit '570c0b79f91c02493d7c0e05db1aea12dbd2d98d':