Merge "Convert IControlsTethering from interface into callback" into oc-dr1-dev