This reverts commit 9ba70560. Reason for revert: The metrics become unstable Bug: 129527548 Change-Id: If1b9368eb55b124a8d66f06c82de193e4ddb9318