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

Change-Id: I5b1063b5b787f814ef78d55f6f5868dfb21c4f9d