Merge "Add measurement unit to Timer results." into sc-mainline-prod