Merge "Bug 967: Do not translate leaf Instance Identifiers."