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

Change-Id: I52602b7bea349fd455eaff7591e4b3f4e153ce63