Fix: Build failed due to unused vars

Merged Akshay Bharambe requested to merge ab_Fix_Breaking into devbranch
  1. Fix: Build failed due to unused vars
Edited by Akshay Bharambe

Merge request reports