Merge "Fix TimePicker RTL issues" into oc-dev am: 7b95c932d6
am: 32974e0705

Change-Id: I452f45754547810e2c54a5fa8d792038b5f558ee