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

Change-Id: I4bb331330c505396427bb72ff7b69c2b6653ba97