Merge "Fix text cut-off for HRM cts test." into oc-dev