am 118b5b03: am 7b3b10b6: Merge "Clean up todos in Dialer" into klp-dev

* commit '118b5b03a9fa3d72a09945534b32a68f8e1e2394':