Merge "Remove the wapper method show_quota_usage()"