Merge "Remove hidden API usage in metrics toString"