Merge "Fix TimePicker crash on rotation." into oc-dev
am: 690691336d

Change-Id: I942187e2c3f852ce992c421e8b45581833818ccb