Add units to some measurements based on measuringInstruction

Change-Id: If2e61b6dadbe191a2d537f68752fc062cdd1f99e
Signed-off-by: Jeremy Ho <jujaga@gmail.com>