Merge "Remove build-time dep on opt-datetimepicker"
am: fa08781197

Change-Id: I0abdbd76d87e96c65fd2b62d8387a7c1ddd24c1c