Revert^2 "[Metrics] Cast the parameter for avoiding ambiguity in a..."

This reverts commit 24cc661a.

Reason for revert: The original CL can be submitted independently. It doesn't need PDD review.

Bug: 294797589
Test: m -j;
Change-Id: Ib3bf9a9df640fb2d15600d7ad850917f285ee8f1