Merge "Convert IControlsTethering from interface into callback" am: 5b9d362b am: ad3fd82f am: b9fc817f am: daa0bd49 Change-Id: I832d77747de7517513c22d36fff4a2fa2bb95154