Addressed comments shared in 3gpp issue 668

[x] Addressed comments in #668
[x] ivas_tools.c and tools.c instrumentation will be addressed in
another MR.