Merge "[COMMON] Fix db-metrics readiness timeout issue"