am 1f116254: Merge "Fix AlertDialog button style" into lmp-mr1-ub-dev

* commit '1f11625423af752876c40cffadb62b754340c91d':
  Fix AlertDialog button style