Merge "Add a field in config to disable/enable the string hashing in metric report." into pi-dev am: 76cb7fe2f6
am: 02b40158ab

Change-Id: I7445eb13283b007738182e2a5ac4808a87124a11