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

Change-Id: I12d574d787fd5c06129ba1bf88d97ff2c324432b