Merge "Fixes date and time picker to use integer values" into cw-f-dev am: 59b829426d
am: 59f3c3f7a0

Change-Id: I730c895602fbae4b8821195a7c98077cb4f19e71