am b5e68792: am 461254b8: Merge "Remove unneeded abstraction in displaying dialogs." into lmp-mr1-dev

* commit 'b5e687925b379acdace5960eab833a9552c52f9d':
  Remove unneeded abstraction in displaying dialogs.