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

Change-Id: Ic786f77889377f3d61433794a65d19f82474f0a9