Merge "Add a field in config to disable/enable the string hashing in metric report." into pi-dev