Merge "Fix RTL layout of custom type clock."