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

Change-Id: Ie43242a78f05aed5566bff33d1ae17fc243335d4