Merge branches 'sh/rtc' and 'common/clkfwk' into sh/urgent