Merge "Fix AlertDialog ignoring the provided theme" into nyc-dev am: 53fb1392f4
am: 83e81b8f73

* commit '83e81b8f732a4ea6d1e5d6f6639573e1110d6a78':
  Fix AlertDialog ignoring the provided theme

Change-Id: I79eaff0dfc544212928fc8884b7c1a5b7e872747