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

Change-Id: I9ec629e60882aec2b4ca84b0b81de4244d43afef