Merge \\"Fix: DatePicker can\\'t show long date string at landscape\\" into nyc-mr1-dev am: c71fc2456a
am: 26fcca7a33

Change-Id: I1e82bad4c006d0fa985532108957150a3a268fb8