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

Change-Id: Id1884d29e0d43808024947de6c366312d2e3e7d0