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

Change-Id: Ic53263868b3ed57850481bfc5816fb962539f72c