Clean up date picker

Bug: 19758502
Change-Id: I11ed62245d15d155335f5652000b9dc81185e2f9
2 files changed