Merge "Fix unexpected DatePicker validation" into oc-dev am: cd603221e1
am: 35d1ab4281

Change-Id: I2303d47c828d654eb0be87d2a1dbb3ca69636985