Merge "BUG-1605: Fix yang-binding interfaces"