Merge "sdm: Fix unused variable error for interface headers"