Merge "Make sure YangInstanceIdentifier.EMPTY is retained"