Merge "Fix the build errors due to the class change of InstanceIdentifier to YangInst...