Merge "Remove build-time dep on opt-datetimepicker"