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

Change-Id: Id06c3a8d76954f40c99673db034342c9023cc408