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