Merge "Fix AlertDialog width on API 11+" into nyc-mr1-dev
am: 924d486e76

Change-Id: I81bdcc9ae5234acfa5ed2f59c71483a90f935898