Merge "[CS05]Remove the hidden API usage of MetricsLogger"