Merge "Fix TimePicker RTL issues" into oc-dev am: 7b95c932d6
am: 8714d472bf

Change-Id: I8a4c4bca36bec2e82993d1418e8e7697b2b14511