Merge "Merge "Use correct date pattern for displaying year in DatePicker" into oc-mr1-dev am: c668bc0d92 am: 5b8476637d"