Merge "Merge "Fix unexpected DatePicker validation" into oc-dev am: cd603221e1 am: 9a06d4bc77" into oc-dr1-dev-plus-aosp
am: a001cfe4ec

Change-Id: I6166806d2fd106637dc781ba200945bc58a41d34