Merge "Fix test and DeviceProfile dump" into tm-qpr-dev