Setting dialog titles correctly.

Change-Id: I063c9ff3c85bdd2ac47f787ec17fe98675ea2f0e
Merge "Setting dialog titles correctly."