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

* commit '98c8687f3b56aaefbebaa6f4ac4b7bf49dedb9ec':
  Fix AlertDialog ignoring the provided theme

Change-Id: Ie61bc274933840b4a12205ed22fbc7909eb25e84