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

Change-Id: Id9f4dd28a012147d62eac99735f9792445c6cd87