Merge "Fix OOM of metro clock" into udc-qpr-dev