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

Change-Id: Iaa491c27aebc60be5fe16668dda7904e2b089f54